From be08101cdf27d6c07542d169fd7534fd4d98da5f Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Sat, 7 Apr 2018 18:22:07 +0200 Subject: [PATCH] extensions: remove many inline statements When the functions are not reused by other fast path definitions, they are only ever used as function pointers and inline is not neccesary. --- extensions/cairo.c | 20 +++++++++--------- extensions/double.c | 17 +++++++-------- extensions/fast-float.c | 20 ++++++++---------- extensions/float.c | 16 ++++++-------- extensions/gegl-fixups.c | 22 +++++++++----------- extensions/gimp-8bit.c | 45 ++++++++++++++++++++-------------------- extensions/half.c | 4 ++-- extensions/simple.c | 18 ++++++++-------- extensions/u16.c | 4 ++-- extensions/u32.c | 12 +++++------ 10 files changed, 83 insertions(+), 95 deletions(-) diff --git a/extensions/cairo.c b/extensions/cairo.c index 9f7aa37..b296751 100644 --- a/extensions/cairo.c +++ b/extensions/cairo.c @@ -26,7 +26,7 @@ int init (void); -static inline void +static void conv_rgba8_cairo24_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { long n = samples; @@ -44,7 +44,7 @@ conv_rgba8_cairo24_le (const Babl *conversion,unsigned char *src, unsigned char } } -static inline void +static void conv_rgb8_cairo24_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { long n = samples; @@ -63,7 +63,7 @@ conv_rgb8_cairo24_le (const Babl *conversion,unsigned char *src, unsigned char * } #if 0 -static inline void +static void conv_rgbA8_premul_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { long n = samples; @@ -82,7 +82,7 @@ conv_rgbA8_premul_cairo32_le (const Babl *conversion,unsigned char *src, unsigne } #else -static inline void +static void conv_rgbA8_premul_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { long n = samples; @@ -137,7 +137,7 @@ static void conv_cairo32_rgbAF_premul_le (const Babl *conversion,unsigned char * } } -static inline void +static void conv_rgba8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { long n = samples; @@ -154,7 +154,7 @@ conv_rgba8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char } } -static inline void +static void conv_rgb8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { long n = samples; @@ -174,7 +174,7 @@ conv_rgb8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char * -static inline void +static void conv_yA8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { long n = samples; @@ -193,7 +193,7 @@ conv_yA8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *d } } -static inline void +static void conv_yA16_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { long n = samples; @@ -210,7 +210,7 @@ conv_yA16_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char * } } -static inline void +static void conv_y8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { long n = samples; @@ -224,7 +224,7 @@ conv_y8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *ds } } -static inline void +static void conv_y16_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { long n = samples; diff --git a/extensions/double.c b/extensions/double.c index 60765a9..98a3351 100644 --- a/extensions/double.c +++ b/extensions/double.c @@ -27,10 +27,7 @@ #include "base/util.h" -#define INLINE inline - - -static INLINE void +static void conv_rgbaD_linear_rgbAD_gamma (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -52,7 +49,7 @@ conv_rgbaD_linear_rgbAD_gamma (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_rgbAD_linear_rgbAD_gamma (const Babl *conversion, unsigned char *src, unsigned char *dst, @@ -94,7 +91,7 @@ conv_rgbAD_linear_rgbAD_gamma (const Babl *conversion, } } -static INLINE void +static void conv_rgbaD_linear_rgbaD_gamma (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -136,7 +133,7 @@ conv_rgbaD_linear_rgbD_linear (const Babl *conversion,unsigned char *src, } -static INLINE void +static void conv_rgbD_linear_rgbD_gamma (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -156,7 +153,7 @@ conv_rgbD_linear_rgbD_gamma (const Babl *conversion,unsigned char *src, } -static INLINE void +static void conv_rgbaD_gamma_rgbaD_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -176,7 +173,7 @@ conv_rgbaD_gamma_rgbaD_linear (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_rgbD_gamma_rgbD_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -196,7 +193,7 @@ conv_rgbD_gamma_rgbD_linear (const Babl *conversion,unsigned char *src, } -static INLINE void +static void conv_rgbD_linear_rgbaD_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) diff --git a/extensions/fast-float.c b/extensions/fast-float.c index 328cbff..b0b7dba 100644 --- a/extensions/fast-float.c +++ b/extensions/fast-float.c @@ -26,8 +26,6 @@ #include "extensions/util.h" #include "base/util.h" -#define INLINE inline - #define LSHIFT 4 typedef float (* BablLookupFunction) (float value, @@ -287,7 +285,7 @@ babl_lookup_free (BablLookup *lookup) } #endif -static INLINE void +static void conv_rgbaF_linear_rgbAF_gamma (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -328,7 +326,7 @@ conv_rgbaF_linear_rgbAF_gamma (const Babl *conversion,unsigned char *src, -static INLINE void +static void conv_rgbaF_linear_rgba8_gamma (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -364,7 +362,7 @@ conv_rgbaF_linear_rgba8_gamma (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_rgbaF_linear_rgbA8_gamma (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -408,7 +406,7 @@ conv_rgbaF_linear_rgbA8_gamma (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_yaF_linear_rgbA8_gamma (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -492,7 +490,7 @@ conv_rgbaF_linear_rgbA8_gamma_cairo (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_rgbAF_linear_rgbAF_gamma (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -532,7 +530,7 @@ conv_rgbAF_linear_rgbAF_gamma (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_rgbaF_linear_rgbaF_gamma (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -550,7 +548,7 @@ conv_rgbaF_linear_rgbaF_gamma (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_rgbF_linear_rgbF_gamma (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -568,7 +566,7 @@ conv_rgbF_linear_rgbF_gamma (const Babl *conversion,unsigned char *src, } -static INLINE void +static void conv_rgbaF_gamma_rgbaF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -586,7 +584,7 @@ conv_rgbaF_gamma_rgbaF_linear (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_rgbF_gamma_rgbF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) diff --git a/extensions/float.c b/extensions/float.c index e832e2e..d700b14 100644 --- a/extensions/float.c +++ b/extensions/float.c @@ -26,11 +26,7 @@ #include "extensions/util.h" #include "base/util.h" - -#define INLINE inline - - -static INLINE void +static void conv_rgbaF_linear_rgbAF_gamma (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -52,7 +48,7 @@ conv_rgbaF_linear_rgbAF_gamma (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_rgbAF_linear_rgbAF_gamma (const Babl *conversion, unsigned char *src, unsigned char *dst, @@ -94,7 +90,7 @@ conv_rgbAF_linear_rgbAF_gamma (const Babl *conversion, } } -static INLINE void +static void conv_rgbaF_linear_rgbaF_gamma (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -115,7 +111,7 @@ conv_rgbaF_linear_rgbaF_gamma (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_rgbF_linear_rgbF_gamma (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -135,7 +131,7 @@ conv_rgbF_linear_rgbF_gamma (const Babl *conversion,unsigned char *src, } -static INLINE void +static void conv_rgbaF_gamma_rgbaF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -155,7 +151,7 @@ conv_rgbaF_gamma_rgbaF_linear (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_rgbF_gamma_rgbF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) diff --git a/extensions/gegl-fixups.c b/extensions/gegl-fixups.c index fd0e6ed..1fbb2bd 100644 --- a/extensions/gegl-fixups.c +++ b/extensions/gegl-fixups.c @@ -49,8 +49,6 @@ #include "extensions/util.h" -#define INLINE inline - /* lookup tables used in conversion */ static float table_8_F[1 << 8]; @@ -133,7 +131,7 @@ table_init (void) } /* function to find the index in table for a float */ -static unsigned int +static inline unsigned int gggl_float_to_index16 (float f) { union @@ -145,7 +143,7 @@ gggl_float_to_index16 (float f) return (u.s >> 15) & ((1 << 17)-1); } -static INLINE void +static inline void conv_F_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { long n = samples; @@ -162,7 +160,7 @@ conv_F_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long sa } -static INLINE void +static inline void conv_F_8g (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { long n = samples; @@ -179,7 +177,7 @@ conv_F_8g (const Babl *conversion,unsigned char *src, unsigned char *dst, long s } -static INLINE void __attribute__((unused)) +static inline void __attribute__((unused)) conv_8_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { long n = samples; @@ -195,7 +193,7 @@ conv_8_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long sa } -static INLINE void +static void conv_rgbaF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { long n = samples; @@ -222,7 +220,7 @@ conv_rgbaF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, } -static INLINE void __attribute__((unused)) +static void __attribute__((unused)) conv_rgbaF_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { long n = samples; @@ -253,13 +251,13 @@ conv_rgbaF_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, #define conv_rgbaF_rgbP8 conv_rgbaF_rgba8 -static INLINE void __attribute__((unused)) +static void __attribute__((unused)) conv_rgbF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { conv_F_8g (conversion, src, dst, samples * 3); } -static INLINE void __attribute__((unused)) +static void __attribute__((unused)) conv_gaF_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { conv_F_8 (conversion, src, dst, samples * 2); @@ -270,7 +268,7 @@ conv_gaF_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, lon #define conv_gAF_gA8 conv_gaF_ga8 -static INLINE void +static void conv_rgba8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { long n = samples; @@ -295,7 +293,7 @@ conv_rgba8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, } } -static INLINE void +static void conv_rgb8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) { long n = samples; diff --git a/extensions/gimp-8bit.c b/extensions/gimp-8bit.c index 3db0be7..a994298 100644 --- a/extensions/gimp-8bit.c +++ b/extensions/gimp-8bit.c @@ -27,8 +27,6 @@ #include "base/util.h" #include "extensions/util.h" -#define INLINE inline - /* lookup tables used in conversion */ @@ -69,7 +67,7 @@ tables_init (const Babl *space) return j; } -static INLINE void +static inline void u8_linear_to_float_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -82,7 +80,7 @@ u8_linear_to_float_linear (const Babl *conversion,unsigned char *src, } -static INLINE void +static void u8_linear_to_float_linear_premul (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -102,7 +100,7 @@ u8_linear_to_float_linear_premul (const Babl *conversion,unsigned char *src, } } -static INLINE void +static inline void u8_gamma_2_2_to_float_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -115,7 +113,7 @@ u8_gamma_2_2_to_float_linear (const Babl *conversion,unsigned char *src, *d++ = lut_gamma_2_2[space_no][*src++]; } -static INLINE void +static void conv_rgba8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -123,7 +121,7 @@ conv_rgba8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src, u8_linear_to_float_linear (conversion, src, dst, samples * 4); } -static INLINE void +static void conv_rgba8_linear_ragabaaF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -132,7 +130,7 @@ conv_rgba8_linear_ragabaaF_linear (const Babl *conversion,unsigned char *src, } -static INLINE void +static void conv_rgba8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -150,7 +148,7 @@ conv_rgba8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_rgb8_linear_rgbF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -158,7 +156,7 @@ conv_rgb8_linear_rgbF_linear (const Babl *conversion,unsigned char *src, u8_linear_to_float_linear (conversion, src, dst, samples * 3); } -static INLINE void +static void conv_rgb8_gamma_2_2_rgbF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -166,7 +164,7 @@ conv_rgb8_gamma_2_2_rgbF_linear (const Babl *conversion,unsigned char *src, u8_gamma_2_2_to_float_linear (conversion, src, dst, samples * 3); } -static INLINE void +static void conv_rgb8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -185,7 +183,7 @@ conv_rgb8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src, #define conv_rgb8_linear_ragabaaF_linear conv_rgb8_linear_rgbaF_linear -static INLINE void +static void conv_rgb8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -203,7 +201,7 @@ conv_rgb8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_ga8_linear_gaF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -211,7 +209,7 @@ conv_ga8_linear_gaF_linear (const Babl *conversion,unsigned char *src, u8_linear_to_float_linear (conversion, src, dst, samples * 2); } -static INLINE void +static void conv_ga8_gamma_2_2_gaF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -227,7 +225,7 @@ conv_ga8_gamma_2_2_gaF_linear (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_ga8_gamma_2_2_rgba8_gamma_2_2 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -243,7 +241,7 @@ conv_ga8_gamma_2_2_rgba8_gamma_2_2 (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_ga8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -262,7 +260,7 @@ conv_ga8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_ga8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -282,7 +280,7 @@ conv_ga8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_g8_linear_gF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -290,7 +288,7 @@ conv_g8_linear_gF_linear (const Babl *conversion,unsigned char *src, u8_linear_to_float_linear (conversion, src, dst, samples); } -static INLINE void +static void conv_g8_gamma_2_2_gF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -298,7 +296,7 @@ conv_g8_gamma_2_2_gF_linear (const Babl *conversion,unsigned char *src, u8_gamma_2_2_to_float_linear (conversion, src, dst, samples); } -static INLINE void +static void conv_g8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -316,7 +314,8 @@ conv_g8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src, *d++ = 1.0; } } -static INLINE void + +static void conv_g8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -336,7 +335,7 @@ conv_g8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_rgbaF_linear_rgb8_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -360,7 +359,7 @@ conv_rgbaF_linear_rgb8_linear (const Babl *conversion,unsigned char *src, } } -static INLINE void +static void conv_rgbaF_linear_rgba8_linear (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) diff --git a/extensions/half.c b/extensions/half.c index 7116671..c45ea85 100644 --- a/extensions/half.c +++ b/extensions/half.c @@ -254,7 +254,7 @@ conv_rgbaHalf_rgbaF (const Babl *conversion,const uint16_t *src, float *dst, lon #define conv_rgbAHalf_rgbAF conv_rgbaHalf_rgbaF -static inline void +static void conv_yF_yHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples) { singles2halfp (dst, src, samples); @@ -335,7 +335,7 @@ static void singles2halfp2(void *target, const void *source, long numel) } } -static inline void +static void conv2_yF_yHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples) { singles2halfp2 (dst, src, samples); diff --git a/extensions/simple.c b/extensions/simple.c index 9bd5d82..072568d 100644 --- a/extensions/simple.c +++ b/extensions/simple.c @@ -176,17 +176,17 @@ float_to_u32_x1 (const Babl *conversion,unsigned char *src_char, unsigned char * src += 1; } } -static inline void +static void float_to_u32_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { float_to_u32_x1 (conversion, src_char, dst_char, samples * 2); } -static inline void +static void float_to_u32_x3 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { float_to_u32_x1 (conversion, src_char, dst_char, samples * 3); } -static inline void +static void float_to_u32_x4 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { float_to_u32_x1 (conversion, src_char, dst_char, samples * 4); @@ -207,20 +207,20 @@ u32_to_float (const Babl *conversion,unsigned char *src_char, unsigned char *dst } } -static inline void +static void u32_to_float_x4 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { u32_to_float (conversion, src_char, dst_char, samples * 4); } -static inline void +static void u32_to_float_x3 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { u32_to_float (conversion, src_char, dst_char, samples * 3); } -static inline void +static void u32_to_float_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { u32_to_float (conversion, src_char, dst_char, samples * 2); @@ -241,20 +241,20 @@ u16_to_float (const Babl *conversion,unsigned char *src_char, unsigned char *dst } } -static inline void +static void u16_to_float_x4 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { u16_to_float (conversion, src_char, dst_char, samples * 4); } -static inline void +static void u16_to_float_x3 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { u16_to_float (conversion, src_char, dst_char, samples * 3); } -static inline void +static void u16_to_float_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { u16_to_float (conversion, src_char, dst_char, samples * 2); diff --git a/extensions/u16.c b/extensions/u16.c index f8cdd21..ad0a35a 100644 --- a/extensions/u16.c +++ b/extensions/u16.c @@ -25,7 +25,7 @@ #include "base/util.h" #include "extensions/util.h" -static inline void +static void conv_rgbu16_rgbau16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) @@ -45,7 +45,7 @@ conv_rgbu16_rgbau16 (const Babl *conversion,unsigned char *src, } } -static inline void +static void conv_yu16_yau16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) diff --git a/extensions/u32.c b/extensions/u32.c index e5e3f64..5e378cb 100644 --- a/extensions/u32.c +++ b/extensions/u32.c @@ -62,7 +62,7 @@ conv_u16_u32 (const Babl *conversion, } -static inline void +static void conv_yau32_yau16 (const Babl *conversion, unsigned char *src, unsigned char *dst, @@ -73,7 +73,7 @@ conv_yau32_yau16 (const Babl *conversion, conv_u32_u16 (conversion, src, dst, samples * 2); } -static inline void +static void conv_rgbu32_rgbu16 (const Babl *conversion, unsigned char *src, unsigned char *dst, @@ -84,7 +84,7 @@ conv_rgbu32_rgbu16 (const Babl *conversion, conv_u32_u16 (conversion, src, dst, samples * 3); } -static inline void +static void conv_rgbu16_rgbu32 (const Babl *conversion, unsigned char *src, unsigned char *dst, @@ -95,7 +95,7 @@ conv_rgbu16_rgbu32 (const Babl *conversion, conv_u16_u32 (conversion, src, dst, samples * 3); } -static inline void +static void conv_yau16_yau32 (const Babl *conversion, unsigned char *src, unsigned char *dst, @@ -107,7 +107,7 @@ conv_yau16_yau32 (const Babl *conversion, } -static inline void +static void conv_rgbau32_rgbau16 (const Babl *conversion, unsigned char *src, unsigned char *dst, @@ -118,7 +118,7 @@ conv_rgbau32_rgbau16 (const Babl *conversion, conv_u32_u16 (conversion, src, dst, samples * 4); } -static inline void +static void conv_rgbau16_rgbau32 (const Babl *conversion, unsigned char *src, unsigned char *dst, -- 2.30.2